Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

QL: Remove the unnecessary DateTimeFunction.dateTimeFormat() #68788

Merged
merged 3 commits into from
Feb 17, 2021
Merged

QL: Remove the unnecessary DateTimeFunction.dateTimeFormat() #68788

merged 3 commits into from
Feb 17, 2021

Conversation

palesz
Copy link
Contributor

@palesz palesz commented Feb 9, 2021 •
edited
Loading

Removes the DateTimeFunction.dateTimeFormat() and the
TranslatorHandler.dateTimeFormat() methods that were
called, but had no effect on the translated queries.

One of the examples, when this happens, is when one side of the
BinaryComparison is a function. The BinaryComparison at the
end turns into a ScriptQuery, but in the intermediate steps the
ExpressionTranslators try to translate it to a RangeQuery.

Follows #68783

QL: Remove DateTimeFunction.dateTimeFormat() and turn eager query t…
ebaae95 
…ranslations lazy

Removes the `DateTimeFunction.dateTimeFormat()` method that was
called, but had no effect on the translated queries.

This change also adds laziness, so translations don't execute unnecessarily.

Before the `ExpressionTranslators` did some unnecessary
`Expression` -> `Query` translations, where the result queries were thrown
away by later translations (by the `wrapFunctionQuery`).

One of the examples, when this happens, is when one side of the
`BinaryComparison` is a function. The `BinaryComparison` at the
end turns into a `ScriptQuery`, but in the intermediate steps the
`ExpressionTranslators` try to translate it to a `RangeQuery`.

Follows elastic#68783
@palesz palesz mentioned this pull request Feb 9, 2021
Merged
@palesz palesz added :Analytics/SQL SQL querying >refactoring Team:QL (Deprecated) Meta label for query languages team v7.12.0 v8.0.0 labels Feb 9, 2021
@palesz palesz marked this pull request as ready for review February 9, 2021 21:58
@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-ql (Team:QL)

matriv
matriv reviewed Feb 9, 2021
View reviewed changes
x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/planner/SqlTranslatorHandler.java Outdated
if (field instanceof StDistance && q instanceof GeoDistanceQuery) {
return ExpressionTranslator.wrapIfNested(q, ((StDistance) field).left());
public Query wrapFunctionQuery(ScalarFunction sf, Expression field, Supplier<Query> querySupplier) {
if (field instanceof StDistance && querySupplier instanceof GeoDistanceQuery) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't it be: querySupplier.get()?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There seems to be no test for it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, good catch! Seems there is no test, good time to add one.

bpintea
bpintea reviewed Feb 10, 2021
View reviewed changes
Copy link
Contributor

@bpintea bpintea left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Besides Marios' comment - and maybe apart from a missing test, if feasible - it LGTM. Good spotting on unused/-sable formats.

x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/planner/SqlTranslatorHandler.java Outdated
if (field instanceof StDistance && q instanceof GeoDistanceQuery) {
return ExpressionTranslator.wrapIfNested(q, ((StDistance) field).left());
public Query wrapFunctionQuery(ScalarFunction sf, Expression field, Supplier<Query> querySupplier) {
if (field instanceof StDistance && querySupplier instanceof GeoDistanceQuery) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There seems to be no test for it?

costin
costin requested changes Feb 10, 2021
View reviewed changes
Copy link
Member

@costin costin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch. However this PR needs to be broken into two - it's a bit more tedious but cleaner.
It looks to me there's a PR for removing date format and another one for adding lazy translation.
The latter in particular has subtle implications and as others have pointed out, it looks like we don't have complete testing in that area - hence the breakage.

@palesz
Copy link
Contributor Author

palesz commented Feb 10, 2021

Good catch. However this PR needs to be broken into two - it's a bit more tedious but cleaner.
It looks to me there's a PR for removing date format and another one for adding lazy translation.
The latter in particular has subtle implications and as others have pointed out, it looks like we don't have complete testing in that area - hence the breakage.

Makes sense, will break it down into two PRs.

@palesz palesz changed the title QL: Remove DateTimeFunction.dateTimeFormat() and turn eager query translations lazy QL: Remove the unnecessary DateTimeFunction.dateTimeFormat() Feb 10, 2021
@palesz
Copy link
Contributor Author

palesz commented Feb 10, 2021 •
edited
Loading

Removed the introduction of lazyness from this PR, will resubmit once this PR is merged to avoid the conflicts.

@palesz palesz requested review from costin, matriv and bpintea February 10, 2021 23:01
matriv
matriv approved these changes Feb 11, 2021
View reviewed changes
Copy link
Contributor

@matriv matriv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

costin
costin approved these changes Feb 15, 2021
View reviewed changes
Copy link
Member

@costin costin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

astefan
astefan approved these changes Feb 17, 2021
View reviewed changes
Copy link
Contributor

@astefan astefan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@palesz palesz merged commit 9ae5753 into elastic:master Feb 17, 2021
palesz pushed a commit to palesz/elasticsearch that referenced this pull request Feb 17, 2021
QL: Remove the unnecessary DateTimeFunction.dateTimeFormat() (elast…
df43c1a 
…ic#68788)

Removes the `DateTimeFunction.dateTimeFormat()` and the 
`TranslatorHandler.dateTimeFormat()` methods that were
called, but had no effect on the translated queries.

One of the examples, when this happens, is when one side of the
`BinaryComparison` is a function. The `BinaryComparison` at the
end turns into a `ScriptQuery`, but in the intermediate steps the
`ExpressionTranslators` try to translate it to a `RangeQuery`.

Follows elastic#68783
@palesz palesz deleted the translator-cleanup branch February 17, 2021 14:08
palesz pushed a commit that referenced this pull request Feb 18, 2021
QL: Remove the unnecessary DateTimeFunction.dateTimeFormat() (#68788)…
31e5af5 
… (#69123)

Removes the `DateTimeFunction.dateTimeFormat()` and the 
`TranslatorHandler.dateTimeFormat()` methods that were
called, but had no effect on the translated queries.

One of the examples, when this happens, is when one side of the
`BinaryComparison` is a function. The `BinaryComparison` at the
end turns into a `ScriptQuery`, but in the intermediate steps the
`ExpressionTranslators` try to translate it to a `RangeQuery`.

Follows #68783
@palesz palesz mentioned this pull request Feb 18, 2021
Merged
palesz pushed a commit that referenced this pull request Mar 2, 2021
QL: Turn eager query translations lazy (#69205)
2dbd59b 
Before the `ExpressionTranslators` did some unnecessary
`Expression` -> `Query` translations, where the result queries were thrown
away by later translations (by the `wrapFunctionQuery`).

This change adds laziness, so translations don't execute unnecessarily.

Follows #68783 and #68788
palesz pushed a commit to palesz/elasticsearch that referenced this pull request Mar 2, 2021
QL: Turn eager query translations lazy (elastic#69205)
4a0b661 
Before the `ExpressionTranslators` did some unnecessary
`Expression` -> `Query` translations, where the result queries were thrown
away by later translations (by the `wrapFunctionQuery`).

This change adds laziness, so translations don't execute unnecessarily.

Follows elastic#68783 and elastic#68788
@palesz palesz mentioned this pull request Mar 2, 2021
Merged
palesz pushed a commit that referenced this pull request Mar 2, 2021
QL: Turn eager query translations lazy (#69205) (#69825)
79d930b 
Before the `ExpressionTranslators` did some unnecessary
`Expression` -> `Query` translations, where the result queries were thrown
away by later translations (by the `wrapFunctionQuery`).

This change adds laziness, so translations don't execute unnecessarily.

Follows #68783 and #68788
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matriv matriv matriv approved these changes

@bpintea bpintea bpintea approved these changes

@astefan astefan astefan approved these changes

@costin costin costin approved these changes

Assignees
No one assigned
Labels
:Analytics/SQL SQL querying >refactoring Team:QL (Deprecated) Meta label for query languages team v7.12.0 v8.0.0-alpha1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@palesz @elasticmachine @costin @astefan @bpintea @matriv @jakelandis